Dev - to Master for Pages #12
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The swf player does NOT work, just replace it with the normal one from Discuz!X 2.5 or Discuz!3.0.
add the normal swf player
Fix Alipay
Fix again swf players. The new players have just 1 line of code "access disabled", because the media play function is forbidden in some counties since 06/2015.
This reverts commit 8e58a89.
This reverts commit 1011b78.
code formatting
fix (1054) Unknown column 'conuintoken' in 'field list'
# Conflicts: # source/plugin/mobile/api/2/uploadavatar.php
|
en. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Dev - to Master for Pages